${uiLabelMap.CommonLogin}
-
-
-
+
+
+
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl (revision 1096554)
+++ specialpurpose/webpos/webapp/webpos/cart/MicroCart.ftl (working copy)
@@ -1,57 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-
-
+
+
+
+
- <#if (shoppingCartSize > 0)>
-
-
- <#else>
-
-
-
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl (revision 0)
+++ specialpurpose/webpos/webapp/webpos/cart/ChooseVariant.ftl (revision 0)
@@ -0,0 +1,77 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (revision 1096554)
+++ specialpurpose/webpos/webapp/webpos/cart/ShowCart.ftl (working copy)
@@ -16,111 +16,135 @@
specific language governing permissions and limitations
under the License.
-->
+
+
+
+<#if (shoppingCartSize > 0)>
+| ${uiLabelMap.WebPosTransactionId} | -${transactionId?default("NA")} | -${(paymentCash.get("description", locale))?if_exists} | -<@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/> | -${uiLabelMap.OrderSalesTax} | -<@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/> | -
| ${uiLabelMap.WebPosDrawer} | -${drawerNumber?default(0)} | -${(paymentCheck.get("description", locale))?if_exists} | -<@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/> | -${uiLabelMap.WebPosCartTotal} | -<@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/> | -
| ${uiLabelMap.WebPosEmployee} | -${userLoginId?default("NA")} | -${(paymentGift.get("description", locale))?if_exists} | -<@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/> | -- | |
| ${uiLabelMap.WebPosTransactionDate} | -${transactionDate?default("NA")} | -${(paymentCredit.get("description", locale))?if_exists} | -<@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/> | -${uiLabelMap.WebPosTransactionTotalDue} | -<@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/> | -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+| ${uiLabelMap.WebPosTransactionId} | +${transactionId?default("NA")} | +${(paymentCash.get("description", locale))?if_exists} | +<@ofbizCurrency amount=cashAmount isoCode=shoppingCart.getCurrency()/> | +${uiLabelMap.WebPosTotalItemSubTotal} | +<@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/> | +
| ${uiLabelMap.WebPosDrawer} | +${drawerNumber?default(0)} | +${(paymentCheck.get("description", locale))?if_exists} | +<@ofbizCurrency amount=checkAmount isoCode=shoppingCart.getCurrency()/> | +${uiLabelMap.WebPosTotalPromotions} | +<@ofbizCurrency amount=shoppingCart.getOrderOtherAdjustmentTotal() isoCode=shoppingCart.getCurrency()/> | +
| ${uiLabelMap.WebPosTerminal} | +<#if isOpen>${uiLabelMap.WebPosTerminalOpen}<#else>${uiLabelMap.WebPosTerminalClose} | +${(paymentGift.get("description", locale))?if_exists} | +<@ofbizCurrency amount=giftAmount isoCode=shoppingCart.getCurrency()/> | +${uiLabelMap.WebPosTotalSalesTax} | +<@ofbizCurrency amount=shoppingCart.getTotalSalesTax() isoCode=shoppingCart.getCurrency()/> | +
| + | + | ${(paymentCredit.get("description", locale))?if_exists} | +<@ofbizCurrency amount=creditAmount isoCode=shoppingCart.getCurrency()/> | +${uiLabelMap.WebPosTotalShipping} | +<@ofbizCurrency amount=shoppingCart.getTotalShipping() isoCode=shoppingCart.getCurrency()/> | +
| ${uiLabelMap.WebPosTransactionTotalDue} | +<@ofbizCurrency amount=totalDue isoCode=shoppingCart.getCurrency()/> | +${uiLabelMap.WebPosTransactionTotalPay} | +<@ofbizCurrency amount=totalPay isoCode=shoppingCart.getCurrency()/> | +${uiLabelMap.WebPosTotal} | +<@ofbizCurrency amount=shoppingCart.getDisplayGrandTotal() isoCode=shoppingCart.getCurrency()/> | +
+
+
+
+
-| ${uiLabelMap.OrderProduct} | +${uiLabelMap.CommonQuantity} | +${uiLabelMap.WebPosUnitPrice} | +${uiLabelMap.WebPosAdjustments} | +${uiLabelMap.WebPosItemTotal} | +${uiLabelMap.CommonRemove} | +
|
+
+ <#if cartLine.getProductId()?exists>
+ <#-- product item -->
+ <#-- start code to display a small image of the product -->
+ <#if cartLine.getParentProductId()?exists>
+ <#assign parentProductId = cartLine.getParentProductId()/>
+ <#else>
+ <#assign parentProductId = cartLine.getProductId()/>
+
+ <#assign smallImageUrl = Static["org.ofbiz.product.product.ProductContentWrapper"].getProductContentAsText(cartLine.getProduct(), "SMALL_IMAGE_URL", locale, dispatcher)?if_exists>
+ <#if !smallImageUrl?string?has_content><#assign smallImageUrl = "/images/defaultImage.jpg">
+ <#if smallImageUrl?string?has_content>
+
+ |
+ + ${cartLine.getQuantity()?string.number} + | +<@ofbizCurrency amount=cartLine.getDisplayPrice() isoCode=shoppingCart.getCurrency()/> |
+ <@ofbizCurrency amount=cartLine.getOtherAdjustments() isoCode=shoppingCart.getCurrency()/> |
+ <@ofbizCurrency amount=cartLine.getDisplayItemSubTotal() isoCode=shoppingCart.getCurrency()/> |
+  |
+
| ${shoppingCartSize?default(0)} | +${totalQuantity?default(0)} | ++ | + | <@ofbizCurrency amount=shoppingCart.getDisplaySubTotal() isoCode=shoppingCart.getCurrency()/> | ++ |
-
-
-
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/error/error.jsp
===================================================================
--- specialpurpose/webpos/webapp/webpos/error/error.jsp (revision 1096554)
+++ specialpurpose/webpos/webapp/webpos/error/error.jsp (working copy)
@@ -16,37 +16,4 @@
specific language governing permissions and limitations
under the License.
--%>
-<%@ page import="org.ofbiz.base.util.*" %>
-
-
-| - | ${uiLabelMap.OrderProduct} | -- | ${uiLabelMap.CommonQuantity} | -${uiLabelMap.WebPosUnitPrice} | -${uiLabelMap.WebPosAdjustments} | -${uiLabelMap.WebPosItemTotal} | -- |
-
-
-
-
-
-
-
+<%response.sendRedirect("control/error");%>
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/Login.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/Login.ftl (revision 1096554)
+++ specialpurpose/webpos/webapp/webpos/Login.ftl (working copy)
@@ -65,6 +65,8 @@
+ -
-
|
-
+ ${uiLabelMap.CommonForgotYourPassword}? Index: specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl =================================================================== --- specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl (revision 1096554) +++ specialpurpose/webpos/webapp/webpos/promo/PromoCode.ftl (working copy) @@ -16,29 +16,26 @@ specific language governing permissions and limitations under the License. --> - -
-
-
-
\ No newline at end of file
+
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl (revision 0)
+++ specialpurpose/webpos/webapp/webpos/shortcuts/Shortcuts.ftl (revision 0)
@@ -0,0 +1,46 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+|
+ |
+ + + | +
-
-
-
Index: specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl (revision 1096554)
+++ specialpurpose/webpos/webapp/webpos/buttons/Promo.ftl (working copy)
@@ -1,36 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-| - 1 - | -- 2 - | -- 3 - | -
| - 4 - | -- 5 - | -- 6 - | -
| - 7 - | -- 8 - | -- 9 - | -
| - 0 - | -- ${uiLabelMap.WebPosButtonReturn} - | -|
| - <#if isOpen?default(false) == true> - ${uiLabelMap.WebPosButtonPromoCode} - <#else> - ${uiLabelMap.WebPosButtonPromoCode} - - | -- ${uiLabelMap.WebPosButtonMain} - | -- - | -
| - ${uiLabelMap.WebPosButtonPayCash} - | -- ${uiLabelMap.WebPosButtonPayCheck} - | -- ${uiLabelMap.WebPosButtonPayGiftCard} - | -
| - ${uiLabelMap.WebPosButtonPayCreditCard} - | -- <#if (totalDue = 0.00)> - ${uiLabelMap.WebPosButtonPayFinish} - <#else> - ${uiLabelMap.WebPosButtonPayFinish} - - | -- <#if (totalPayments > 0.00)> - ${uiLabelMap.WebPosButtonPaySetRef} - <#else> - ${uiLabelMap.WebPosButtonPaySetRef} - - | -
| - <#if (totalPayments > 0.00)> - ${uiLabelMap.WebPosButtonPayClear} - <#else> - ${uiLabelMap.WebPosButtonPayClear} - - | -- <#if (totalPayments > 0.00)> - ${uiLabelMap.WebPosButtonPayClearAll} - <#else> - ${uiLabelMap.WebPosButtonPayClearAll} - - | -- ${uiLabelMap.WebPosButtonMain} - | -
-
- <#else>
- ${uiLabelMap.WebPosTransactionTotalDue} <@ofbizCurrency amount=totalDue isoCode=cart.getCurrency()/>
-
-
-
-
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/buttons/Main.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/buttons/Main.ftl (revision 1096554)
+++ specialpurpose/webpos/webapp/webpos/buttons/Main.ftl (working copy)
@@ -1,122 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-${uiLabelMap.WebPosCompleteSale}
-| - ${uiLabelMap.WebPosButtonMain} - | -- - | -- <#if isManagerLoggedIn?default(false) == true> - ${uiLabelMap.WebPosButtonManager} - <#else> - ${uiLabelMap.WebPosButtonManager} - - | -
| - ${uiLabelMap.WebPosButtonPromo} - | -- - | -- <#if (shoppingCartSize > 0)> - ${uiLabelMap.WebPosButtonPayment} - <#else> - ${uiLabelMap.WebPosButtonPayment} - - | -
| - <#if (shoppingCartSize > 0)> - ${uiLabelMap.WebPosRecalculateCart} - <#else> - ${uiLabelMap.WebPosRecalculateCart} - - | -- <#if (shoppingCartSize > 0)> - ${uiLabelMap.WebPosEmptyCart} - <#else> - ${uiLabelMap.WebPosEmptyCart} - - | -- <#if (shoppingCartSize > 0)> - ${uiLabelMap.WebPosRemoveSelected} - <#else> - ${uiLabelMap.WebPosRemoveSelected} - - | -
| - NAN GIZMO - | -- PURPLE GIZMO - | -- ROUND GIZMO - | -
| - SQUARE GIZMO - | -- MASSIVE GIZMO - | -- TINY WIDGET - | -
| - RAINBOW GIZMO - | -- NIT GIZMO - | -- BIG GIZMO - | -
| - MICRO WIDGET - | -- - | -- <#if userLogin?has_content && userLogin.userLoginId != "anonymous"> - ${uiLabelMap.WebPosButtonLogout} - <#else/> - ${uiLabelMap.WebPosButtonLogin} - - | -
| - <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == false> - ${uiLabelMap.WebPosButtonOpenTerminal} - <#else> - ${uiLabelMap.WebPosButtonOpenTerminal} - - | -- <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true> - ${uiLabelMap.WebPosButtonCloseTerminal} - <#else> - ${uiLabelMap.WebPosButtonCloseTerminal} - - | -- <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true> - ${uiLabelMap.WebPosButtonVoidOrder} - <#else> - ${uiLabelMap.WebPosButtonVoidOrder} - - | -
| - <#if isManagerLoggedIn?default(false) == true> - ${uiLabelMap.WebPosButtonShutdown} - <#else> - ${uiLabelMap.WebPosButtonShutdown} - - | -- <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true> - ${uiLabelMap.WebPosButtonPaidIn} - <#else> - ${uiLabelMap.WebPosButtonPaidIn} - - | -- <#if isManagerLoggedIn?default(false) == true && isOpen?default(false) == true> - ${uiLabelMap.WebPosButtonPaidOut} - <#else> - ${uiLabelMap.WebPosButtonPaidOut} - - | -
| - ${uiLabelMap.WebPosButtonModifyPrice} - | -- ${uiLabelMap.WebPosButtonMain} - | -- - | -
"; + } else { + var features = variantTree[previousFeatureValue]; + selectList = selectList + feature + " "; + selectList = selectList + "
"; + } + idx++; + previousFeatureValue = featureValue; + }); + jQuery('#features').html(selectList); + var idx = 0; + var features = variantTree; + jQuery.each(featureOrder, function(i, actualFeature) { + var feature = featureTypes[actualFeature]; + featureValue = "FT" + feature; + jQuery('#' + featureValue).bind('change', function(event) { + selectVariant(variantData, 'N'); + return false; + }); + var featValue = jQuery('#' + featureValue).val(); + idx++; + for (var key in features) { + if (key == featValue) { + if (idx == featureOrder.length) { + jQuery('#variantProductId').val(features[key]); + var param = 'productId=' + jQuery('#variantProductId').val(); + jQuery.ajax({url: 'GetProductAndPrice', + data: param, + type: 'post', + async: false, + success: function(data) { + getResultOfGetProductAndPrice(data); + }, + error: function(data) { + getResultOfGetProductAndPrice(data); + } + }); + } else { + features = features[key]; + } + } + } + }); + } + } + } + } + jQuery('#variant').val('Y'); + jQuery('#features').show(); + jQuery('#chooseVariant').show(); + jQuery('#variantQuantity').focus(); +} + +function selectFeature(data, firstTime, productId) { + var featureLists = data.featureLists; + if (featureLists != undefined && featureLists.length > 0) { + var selectList = ""; + for (i = 0; i < featureLists.length; i++) { + featureList = featureLists[i]; + for (j = 0; j < featureList.length; j++) { + var feature = featureList[j]; + if (j == 0) { + selectList = selectList + feature.description + " "; + selectList = selectList + "
"; + } + jQuery('#variantProductId').val(productId); + jQuery('#features').html(selectList); + } + jQuery('#variant').val('N'); + jQuery('#features').show(); + jQuery('#chooseVariant').show(); + jQuery('#variantQuantity').focus(); +} + +function getResultOfGetProductAndPrice(data) { + var serverError = getServerError(data); + if (serverError != "") { + jQuery('#chooseVariantFormServerError').update(serverError); + chooseVariant('N', data); + } else { + clearErrorMessages(); + var product = data.product; + var price = data.price; + var currencyUomId = data.currencyUomId; + if (product.productName != null) { + jQuery('#variantProductDescription').update(product.productName); + } else if (product.productDescription != null) { + jQuery('#variantProductDescription').update(product.productDescription); + } else if (product.longDescription != null) { + jQuery('#variantProductDescription').update(product.longDescription); + } + var formattedPrice = getFormattedAmount(price, currencyUomId); + jQuery('#variantProductPrice').update(formattedPrice); + } +} + +function getFormattedProductFeaturePrice(productFeatureIdIn, productPriceTypeIdIn, currencyUomIdIn) { + var formattedAmount = ""; + var param = 'productFeatureId=' + productFeatureIdIn + '&productPriceTypeId=' + productPriceTypeIdIn + '¤cyUomId=' + currencyUomIdIn; + jQuery.ajax({url: 'GetFormattedProductFeaturePrice', + data: param, + type: 'post', + async: false, + success: function(data) { + formattedAmount = getResultOfGetFormattedProductFeaturePrice(data); + }, + error: function(data) { + formattedAmount = getResultOfGetFormattedProductFeaturePrice(data); + } + }); + return formattedAmount; +} + +function getResultOfGetFormattedProductFeaturePrice(data) { + return data.formattedFeaturePrice; +} \ No newline at end of file Index: specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js =================================================================== --- specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js (revision 0) +++ specialpurpose/webpos/webapp/webpos/images/js/WebPosHotkeys.js (revision 0) @@ -0,0 +1,9 @@ +WebPosHotkeys = { + hotkeys: [], + + bind: function (type, data, fnCode, fn, label) { + var arr = [type, data, fnCode, fn, label]; + this.hotkeys.push(arr); + $(document).bind(type, data, fnCode); + } +} \ No newline at end of file Index: specialpurpose/webpos/webapp/webpos/images/js/SearchProductsResults.js =================================================================== --- specialpurpose/webpos/webapp/webpos/images/js/SearchProductsResults.js (revision 0) +++ specialpurpose/webpos/webapp/webpos/images/js/SearchProductsResults.js (revision 0) @@ -0,0 +1,130 @@ +/* +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +*/ +jQuery(document).ready(function() { + jQuery('#searchByProductIdValue').bind('keypress', function(event) { + code = event.keyCode ? event.keyCode : event.which; + if (code.toString() == 13) { + productSearchAgain(); + return false; + } + if (code.toString() == 27) { + productToSearchFocus(); + return false; + } + }); + + jQuery('#searchByProductName').bind('keypress', function(event) { + code = event.keyCode ? event.keyCode : event.which; + if (code.toString() == 13) { + productSearchAgain(); + return false; + } + if (code.toString() == 27) { + productToSearchFocus(); + return false; + } + }); + + jQuery('#searchByProductDescription').bind('keypress', function(event) { + code = event.keyCode ? event.keyCode : event.which; + if (code.toString() == 13) { + productSearchAgain(); + return false; + } + if (code.toString() == 27) { + productToSearchFocus(); + return false; + } + }); + + jQuery('#searchProductsResultsSearch').bind('click', function(event) { + productSearchAgain(); + }); + + jQuery('#searchProductsResultsCancel').bind('click', function(event) { + jQuery('#searchProductsResults').hide(); + productToSearchFocus(); + }); +}); + +function buildProductsResults(products, fromProductSearch) { + var alt_row = false; + var idx = 1; + var tableList = ""; + jQuery.each(products, function(i, product) { + if (alt_row) { + classType = "class=\"pos-cart-even\""; + } else { + classType = "class=\"pos-cart-odd\""; + } + productName = checkNull(product.productName); + productDescription = checkNull(product.description); + tableList = tableList + "
'; + shortcutList = shortcutList + arr[4] + '
+
+
+
+
+ + +
+
+
\ No newline at end of file
Property changes on: specialpurpose/webpos/webapp/webpos/search/SearchParties.ftl
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Date Rev Author URL Id
Added: svn:eol-style
+ native
Index: specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl (revision 0)
+++ specialpurpose/webpos/webapp/webpos/search/SearchPartiesResults.ftl (revision 0)
@@ -0,0 +1,86 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl (revision 0)
+++ specialpurpose/webpos/webapp/webpos/search/CustomerAddress.ftl (revision 0)
@@ -0,0 +1,121 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
++ + +
+
+
+
+
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl (revision 0)
+++ specialpurpose/webpos/webapp/webpos/search/SearchSalesReps.ftl (revision 0)
@@ -0,0 +1,60 @@
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+
+
+
+
+
+
+
+
+
+ <#if billingPostalAddress?exists>
+ <#if personBillTo?exists>
+
+
+
+ | <#if personBillTo.lastName?has_content>${personBillTo.lastName} <#if personBillTo.firstName?has_content>${personBillTo.firstName} | +
| <#if billingPostalAddress.address1?has_content>${billingPostalAddress.address1} | +
| <#if billingPostalAddress.city?has_content>${billingPostalAddress.city}, <#if state?exists && state?has_content && state.geoCode?has_content>${state.geoCode} <#if billingPostalAddress.postalCode?has_content>${billingPostalAddress.postalCode} + | +
| <#if country?exists && country?has_content &&country.get("geoName", locale)?has_content>${country.get("geoName", locale)} + | +
| + |
| ${uiLabelMap.WebPosNoPartyInformation} | +
+ ${screens.render("component://webpos/widget/SearchScreens.xml#Parties")}
+
+
+
+
+
+
+
+
+ +
+
\ No newline at end of file
Index: specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl
===================================================================
--- specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl (revision 1096554)
+++ specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl (working copy)
@@ -16,26 +16,24 @@
specific language governing permissions and limitations
under the License.
-->
-
+ <#if salesReps?exists && salesReps?has_content>
+
+ <#assign alt_row = false>
+ <#list salesReps as salesRep>
+ <#assign salesRepInCart = false>
+ <#if cartSalesReps?exists && cartSalesReps?has_content>
+ <#list cartSalesReps as cartSalesRep>
+ <#if cartSalesRep == salesRep.partyId>
+ <#assign salesRepInCart = true>
+
+
+
+ <#assign person = ""/>
+ <#if salesRep.lastName?has_content>
+ <#assign person = person + (salesRep.lastName).trim() + " "/>
+
+ <#if salesRep.firstName?has_content>
+ <#assign person = person + (salesRep.firstName).trim()/>
+
+ <#assign person = person + " (" + salesRep.partyId + ")"/>
+
+
+
+| + <#if salesRepInCart> + + ${person} + + <#else> + + ${person} + + + | +
\ No newline at end of file Index: specialpurpose/webpos/webapp/webpos/includes/Footer.ftl =================================================================== --- specialpurpose/webpos/webapp/webpos/includes/Footer.ftl (revision 1096554) +++ specialpurpose/webpos/webapp/webpos/includes/Footer.ftl (working copy) @@ -1,34 +0,0 @@ -<#-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> - -<#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()> - -
-
- 
- 
-
-
-
--
-
-Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - www.apache.org
- Powered by Apache OFBiz
--